Merge master@5428150 into git_qt-dev-plus-aosp. Change-Id: I36d7ae4a4d13a5929b7c78389953efee71824d18 BUG: 129345239